Skip to content

[v2] lint for merge of pre-commit hooks#2235

Closed
sam-hey wants to merge 1 commit intoembeddings-benchmark:v2.0.0from
sam-hey:lint/lint_v2
Closed

[v2] lint for merge of pre-commit hooks#2235
sam-hey wants to merge 1 commit intoembeddings-benchmark:v2.0.0from
sam-hey:lint/lint_v2

Conversation

@sam-hey
Copy link
Contributor

@sam-hey sam-hey commented Mar 4, 2025 •
edited
Loading

ref: #2194

When merging this, just the "normal" Problems do exist:

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   mteb/abstasks/Image/AbsTaskAny2AnyMultiChoice.py
        both modified:   mteb/abstasks/Image/AbsTaskAny2AnyRetrieval.py
        both modified:   mteb/benchmarks/benchmarks.py
        both modified:   mteb/models/bge_models.py
        both modified:   mteb/models/e5_instruct.py
        both modified:   mteb/models/e5_models.py
        both modified:   mteb/models/linq_models.py
        both modified:   mteb/models/ru_sentence_models.py
        both modified:   mteb/models/voyage_models.py
        both modified:   mteb/overview.py
        both modified:   mteb/tasks/Image/ImageClassification/eng/OxfordFlowersClassification.py
        both modified:   mteb/tasks/aggregated_tasks/__init__.py
        both modified:   pyproject.toml
        both modified:   tests/test_TaskMetadata.py
        both modified:   tests/test_overview.py
        both modified:   tests/test_tasks/test_all_abstasks.py

cc @KennethEnevoldsen

@sam-hey sam-hey mentioned this pull request Mar 4, 2025
Merged
@sam-hey
Copy link
Contributor Author

sam-hey commented Mar 4, 2025

Getting HTTP 307 can some Maintainer trigger the CI pls!

@Samoed
Copy link
Member

Samoed commented Mar 4, 2025

I've updated merged changes from main to v2 branch. Overall I think you firstly we should merge #2194 into main and after that merge main to v2

@sam-hey
Copy link
Contributor Author

sam-hey commented Mar 4, 2025

This PR dose only includes the linting - not the code hooks etc to do it. The goal I was going for is to reduce merge conflicts as both are formatted etc to reduce merge conflicts.

@Samoed
Copy link
Member

Samoed commented Mar 4, 2025

Every file change would create conflict (e.g. each json file). So I think it would be better to merge to main and after that to v2

@sam-hey
Copy link
Contributor Author

sam-hey commented Mar 4, 2025

If the changes are the same, there aren't more merge conflicts; it would be less or the same. But I am fine with merging main into v2.

@sam-hey sam-hey closed this Mar 4, 2025
@Samoed
Copy link
Member

Samoed commented Mar 4, 2025

Git would try to compare to common commit and there will be a lot of files to change even if both files would have same changes

@sam-hey
Copy link
Contributor Author

sam-hey commented Mar 4, 2025

But they don't appear in the merge editor. The initial comment did mention the changes that need to be resolved manually during the merge from main to v2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sam-hey @Samoed